resort if we're already in 'unsorted' state, and update the docs

Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
        resort if we're already in 'unsorted' state, and update the docs

diff --git a/ChangeLog b/ChangeLog
index 09c42b39fac0a46b30063e847ed3fbdb40a8a329..e9ad6c80c38e9c046e756462123f31955695b433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
+       resort if we're already in 'unsorted' state, and update the docs
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): Remove doc

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 09c42b39fac0a46b30063e847ed3fbdb40a8a329..e9ad6c80c38e9c046e756462123f31955695b433 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
+       resort if we're already in 'unsorted' state, and update the docs
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): Remove doc

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 09c42b39fac0a46b30063e847ed3fbdb40a8a329..e9ad6c80c38e9c046e756462123f31955695b433 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
+       resort if we're already in 'unsorted' state, and update the docs
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): Remove doc

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 09c42b39fac0a46b30063e847ed3fbdb40a8a329..e9ad6c80c38e9c046e756462123f31955695b433 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
+       resort if we're already in 'unsorted' state, and update the docs
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): Remove doc

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 09c42b39fac0a46b30063e847ed3fbdb40a8a329..e9ad6c80c38e9c046e756462123f31955695b433 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
+       resort if we're already in 'unsorted' state, and update the docs
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): Remove doc

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 09c42b39fac0a46b30063e847ed3fbdb40a8a329..e9ad6c80c38e9c046e756462123f31955695b433 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Apr 25 00:26:34 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func):
+       resort if we're already in 'unsorted' state, and update the docs
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): Remove doc

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 99ba15aec0c578e802518bf4df54af62725e824a..b0021415e530b2b04aac171f46404b5c471e6527 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -2200,7 +2200,9 @@ gtk_tree_model_sort_clear_cache_helper (GtkTreeModelSort *tree_model_sort,
  * @tree_model_sort: A #GtkTreeModelSort
  * 
  * This resets the default sort function to be in the 'unsorted' state.  That
- * is, it is in the same order as the child model.
+ * is, it is in the same order as the child model. It will re-sort the model
+ * to be in the same order as the child model only if the #GtkTreeModelSort
+ * is in 'unsorted' state.
  **/
 void
 gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort)
@@ -2218,6 +2220,9 @@ gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort)
   tree_model_sort->default_sort_func = NO_SORT_FUNC;
   tree_model_sort->default_sort_data = NULL;
   tree_model_sort->default_sort_destroy = NULL;
+
+  if (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+    gtk_tree_model_sort_sort (tree_model_sort);
   tree_model_sort->sort_column_id = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
 }